ChangeLog fix

diff --git a/src/ChangeLog b/src/ChangeLog
index 1b6c60062830a919ea4ba662df5e817e7ef87032..4e8d34423f3e2ecb1cd71cf6c2fd09a64b4ab9b8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1294,7 +1294,6 @@
        * sysdep.c (init_signals): Do not use SA_NODEFER.  It wasn't
        wanted even on POSIXish hosts, and it doesn't work on Windows.
 
->>>>>>> MERGE-SOURCE
 2012-09-23  Jan Djärv  <jan.h.d@swipnet.se>
 
        * xterm.c (x_term_init): Call fixup_locale before and after calling